bitkeeper revision 1.1627.1.1 (429dccc4mVL3VaR3aEhZK7D4ZhqHfA)

remove assertion that REMOVABLE/CDROM devices have no partition.

Signed-off-by: Vincent Hanquez <vincent@xensource.com>

diff --git a/linux-2.6.11-xen-sparse/drivers/xen/blkfront/vbd.c b/linux-2.6.11-xen-sparse/drivers/xen/blkfront/vbd.c
index 303d8ccae4c05e25b584e0a60078219a32bd33bd..233aeda16c27597279a98c9891827661367b11fd 100644 (file)
--- a/linux-2.6.11-xen-sparse/drivers/xen/blkfront/vbd.c
+++ b/linux-2.6.11-xen-sparse/drivers/xen/blkfront/vbd.c
@@ -275,15 +275,14 @@ struct gendisk *xlvbd_alloc_gendisk(
     di->mi = mi;
     di->xd_device = disk->device;
 
-    if (((disk->info & (VDISK_CDROM|VDISK_REMOVABLE)) == 0) &&
-        ((minor & ((1 << mi->type->partn_shift) - 1)) == 0))
+    if ((minor & ((1 << mi->type->partn_shift) - 1)) == 0)
         nr_minors = 1 << mi->type->partn_shift;
 
     gd = alloc_disk(nr_minors);
     if (gd == NULL)
         goto out;
 
-    if (((disk->info & (VDISK_CDROM|VDISK_REMOVABLE)) != 0) || (nr_minors > 1))
+    if (nr_minors > 1)
         sprintf(gd->disk_name, "%s%c", mi->type->diskname,
                 'a' + mi->index * mi->type->disks_per_major +
                     (minor >> mi->type->partn_shift));